diff --git a/disk/Makefile b/disk/Makefile
index 12c0531..ccd0335 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2000-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 #ccflags-y += -DET_DEBUG -DDEBUG
 
diff --git a/disk/part.c b/disk/part.c
index e31aca4..9266a09 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 1b7d915..86d008d 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Hans-Joerg Frieden, Hyperion Entertainment
  * Hans-JoergF@hyperion-entertainment.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <command.h>
diff --git a/disk/part_amiga.h b/disk/part_amiga.h
index a3fe1a9..42f5eb0 100644
--- a/disk/part_amiga.h
+++ b/disk/part_amiga.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2000
  * Hans-Joerg Frieden, Hyperion Entertainment
  * Hans-JoergF@hyperion-entertainment.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _DISK_PART_AMIGA_H
diff --git a/disk/part_dos.c b/disk/part_dos.c
index 84e672b..936cee0 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Raymond Lo, lo@routefree.com
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/disk/part_dos.h b/disk/part_dos.h
index 0321d92..434b021 100644
--- a/disk/part_dos.h
+++ b/disk/part_dos.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _DISK_PART_DOS_H
diff --git a/disk/part_efi.c b/disk/part_efi.c
index fb221ee..72e3997 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2008 RuggedCom, Inc.
  * Richard Retanubun <RichardRetanubun@RuggedCom.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/disk/part_iso.c b/disk/part_iso.c
index ef582de..e733227 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland, d.peter@mpl.ch.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/disk/part_iso.h b/disk/part_iso.h
index 045784f..eb2c3ab 100644
--- a/disk/part_iso.h
+++ b/disk/part_iso.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland, d.peter@mpl.ch.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #ifndef _PART_CD_H
 #define _PART_CD_H
diff --git a/disk/part_mac.c b/disk/part_mac.c
index e65930d..8b2c004 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/disk/part_mac.h b/disk/part_mac.h
index 6735144..5f396c9 100644
--- a/disk/part_mac.h
+++ b/disk/part_mac.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*